Fix driver build for RHEL 7.7/4.13+ w/CONFIG_VIRT_CPU_ACCOUNTING_GEN #1471
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gnosek
force-pushed
the
rhel77-fix
branch
2 times, most recently
from
1e4edbf
to
584d37e
Compare
bryanseay
approved these changes
Aug 8, 2019
| @@ -48,15 +49,26 @@ void ppm_task_cputime_adjusted(struct task_struct *p, cputime_t *ut, cputime_t * | |||
| #endif | |||
|
|
|||
| #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN | |||
|
|
|||
| #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)) || (PPM_RHEL_RELEASE_CODE > 0 && PPM_RHEL_RELEASE_CODE >= PPM_RHEL_RELEASE_VERSION(7, 7)) | |||
There was a problem hiding this comment.
I added a comment to the PPM_* macros but I'm not sure what I can say here that isn't already expressed by the code. If we're building for >= 4.13 or for RHEL >= 7.7, use the new macros, otherwise use the old ones.
Kernel commits 60a9ce57e7c5ac1df3a39fb941022bbfa40c0862 and bac5b6b6b11560f323e71d0ebac4061cfe5f56c0 move the vtime_* fields from task_struct to a nested struct vtime. RHEL 7.7 is the first kernel where we hit this but the changes landed in upstream kernel 4.13. To hit this bug, CONFIG_VIRT_CPU_ACCOUNTING_GEN has to be set.
RHEL 8.1 backports the definition of access_ok from 5.0.
|
Is there an ETA on a release with this fix included? We are running into this issue as well. Cheers, |
|
Based off the release notes, it looks like this went into release tag 0.26.3. |
robbycochran
added a commit
to stackrox/collector
that referenced
this pull request
Sep 25, 2019
robbycochran
added a commit
to stackrox/collector
that referenced
this pull request
Sep 25, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Kernel commits 60a9ce57e7c5ac1df3a39fb941022bbfa40c0862
and bac5b6b6b11560f323e71d0ebac4061cfe5f56c0 move the vtime_* fields
from task_struct to a nested struct vtime.
RHEL 7.7 is the first kernel where we hit this but the changes landed
in upstream kernel 4.13.
To hit this bug, CONFIG_VIRT_CPU_ACCOUNTING_GEN has to be set.